Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[8.16] [Serverless][8.17][8.16]: Security – Alerts section bugs (backport #6240) #6373

Merged
merged 2 commits into from
Dec 19, 2024
Merged

[8.16] [Serverless][8.17][8.16]: Security – Alerts section bugs (backport #6240) #6373

merged 2 commits into from
Dec 19, 2024
+3 −7

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 19, 2024

Fixes #6038

Serverless:

ESS: (Same changes as above)

@nastasha-solomon @mergify
[Serverless][8.17][8.16]: Security – Alerts section bugs (#6240)
f30f7ec 
* First draft

* Update docs/detections/alerts-reduce.asciidoc

* Removes outdated content

* more changes

* Removes docs for the enableCcsWarning setting

* Oops - readds sections

(cherry picked from commit 0cec577)

# Conflicts:
#	docs/serverless/alerts/alerts-ui-manage.asciidoc
#	docs/serverless/alerts/reduce-notifications-alerts.asciidoc
#	docs/serverless/alerts/view-alert-details.asciidoc
#	docs/serverless/images/view-alert-details/-detections-about-section-rp.png
@mergify mergify bot requested a review from a team as a code owner December 19, 2024 15:11
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Dec 19, 2024

Cherry-pick of 0cec577 has failed:

On branch mergify/bp/8.16/pr-6240
Your branch is up to date with 'origin/8.16'.

You are currently cherry-picking commit 0cec5776.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   docs/detections/alerts-reduce.asciidoc
	modified:   docs/detections/alerts-ui-manage.asciidoc
	modified:   docs/detections/alerts-view-details.asciidoc
	modified:   docs/detections/images/about-section-rp.png

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   docs/serverless/alerts/alerts-ui-manage.asciidoc
	deleted by us:   docs/serverless/alerts/reduce-notifications-alerts.asciidoc
	deleted by us:   docs/serverless/alerts/view-alert-details.asciidoc
	deleted by us:   docs/serverless/images/view-alert-details/-detections-about-section-rp.png

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@github-actions GitHub Actions
Copy link

A documentation preview will be available soon.

Request a new doc build by commenting
  • Rebuild this PR: run docs-build
  • Rebuild this PR and all Elastic docs: run docs-build rebuild

run docs-build is much faster than run docs-build rebuild. A rebuild should only be needed in rare situations.

If your PR continues to fail for an unknown reason, the doc build pipeline may be broken. Elastic employees can check the pipeline status here.

@nastasha-solomon nastasha-solomon merged commit 45c7161 into 8.16 Dec 19, 2024
3 checks passed
@nastasha-solomon nastasha-solomon deleted the mergify/bp/8.16/pr-6240 branch December 19, 2024 15:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nastasha-solomon nastasha-solomon nastasha-solomon approved these changes

Assignees

@nastasha-solomon nastasha-solomon

Labels
backport conflicts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@nastasha-solomon